projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c63f5a b67b453)
bitkeeper revision 1.1159.212.14 (41e016e0WABx7Lr5PD8jIm9NC3fw7g)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sat, 8 Jan 2005 17:22:40 +0000 (17:22 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sat, 8 Jan 2005 17:22:40 +0000 (17:22 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/common/physdev.c patch | diff1 | diff2 | blob | history

diff --cc xen/common/physdev.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.